bitkeeper revision 1.1472.3.1 (4290dc73cMlPc5EvXdqDP501vv78Vw)

config.h, Makefile:
  CONFIG_PCI disabled in xen

Signed-off-by: Arun Sharma <arun.sharma@intel.com>

diff --git a/xen/arch/ia64/lib/Makefile b/xen/arch/ia64/lib/Makefile
index a181d5166dc590d2603d13078d0a12feb60d063d..77e94724ce08d2f58694760c78a6060f60ea81e8 100644 (file)
--- a/xen/arch/ia64/lib/Makefile
+++ b/xen/arch/ia64/lib/Makefile
@@ -9,7 +9,7 @@ OBJS := __divsi3.o __udivsi3.o __modsi3.o __umodsi3.o                   \
        bitop.o checksum.o clear_page.o csum_partial_copy.o copy_page.o \
        clear_user.o strncpy_from_user.o strlen_user.o strnlen_user.o   \
        flush.o ip_fast_csum.o do_csum.o copy_user.o                    \
-       memset.o strlen.o memcpy.o swiotlb.o
+       memset.o strlen.o memcpy.o 
 
 default: $(OBJS)
        $(LD) -r -o ia64lib.o $(OBJS)

diff --git a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h
index c07bfea51c6ea64c7e9043e6346e01a6a5a37242..677b12cfaa2296c73542fa875129634da337576b 100644 (file)
--- a/xen/include/asm-ia64/config.h
+++ b/xen/include/asm-ia64/config.h
@@ -255,10 +255,6 @@ extern int ht_per_core;
 #define CONFIG_ACPI_BOOT 1
 //#endif
 
-#define CONFIG_PCI 1
-#define CONFIG_PCI_BIOS 1
-#define CONFIG_PCI_DIRECT 1
-
 #define CONFIG_XEN_ATTENTION_KEY 1
 #endif /* __ASSEMBLY__ */
 #endif /* __XEN_IA64_CONFIG_H__ */